Don't call g_thread_init(), we don't want to link to -lgthread if we don't

Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
	g_thread_init(), we don't want to link to -lgthread if we don't
	have to.

diff --git a/ChangeLog b/ChangeLog
index 3efdfcedaac1e8fe77fd0b935d7b44ad11d4c723..ab5603e5b7d8df46159bb84c0cb25332c41b5cbf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
+       g_thread_init(), we don't want to link to -lgthread if we don't
+       have to.
+
 Mon Oct 22 08:51:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.[ch] (gdk_threads_init) docs/Changes-2.0.txt: 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3efdfcedaac1e8fe77fd0b935d7b44ad11d4c723..ab5603e5b7d8df46159bb84c0cb25332c41b5cbf 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
+       g_thread_init(), we don't want to link to -lgthread if we don't
+       have to.
+
 Mon Oct 22 08:51:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.[ch] (gdk_threads_init) docs/Changes-2.0.txt: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3efdfcedaac1e8fe77fd0b935d7b44ad11d4c723..ab5603e5b7d8df46159bb84c0cb25332c41b5cbf 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
+       g_thread_init(), we don't want to link to -lgthread if we don't
+       have to.
+
 Mon Oct 22 08:51:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.[ch] (gdk_threads_init) docs/Changes-2.0.txt: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3efdfcedaac1e8fe77fd0b935d7b44ad11d4c723..ab5603e5b7d8df46159bb84c0cb25332c41b5cbf 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
+       g_thread_init(), we don't want to link to -lgthread if we don't
+       have to.
+
 Mon Oct 22 08:51:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.[ch] (gdk_threads_init) docs/Changes-2.0.txt: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3efdfcedaac1e8fe77fd0b935d7b44ad11d4c723..ab5603e5b7d8df46159bb84c0cb25332c41b5cbf 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
+       g_thread_init(), we don't want to link to -lgthread if we don't
+       have to.
+
 Mon Oct 22 08:51:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.[ch] (gdk_threads_init) docs/Changes-2.0.txt: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3efdfcedaac1e8fe77fd0b935d7b44ad11d4c723..ab5603e5b7d8df46159bb84c0cb25332c41b5cbf 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
+       g_thread_init(), we don't want to link to -lgthread if we don't
+       have to.
+
 Mon Oct 22 08:51:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.[ch] (gdk_threads_init) docs/Changes-2.0.txt: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3efdfcedaac1e8fe77fd0b935d7b44ad11d4c723..ab5603e5b7d8df46159bb84c0cb25332c41b5cbf 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Oct 22 10:12:08 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
+       g_thread_init(), we don't want to link to -lgthread if we don't
+       have to.
+
 Mon Oct 22 08:51:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.[ch] (gdk_threads_init) docs/Changes-2.0.txt: 

diff --git a/docs/Changes-2.0.txt b/docs/Changes-2.0.txt
index 01e0c5c75d658ae0791598dd73f325d692d868ae..5b79890799a750dbc1206a240bc479bb97f3cb1c 100644 (file)
--- a/docs/Changes-2.0.txt
+++ b/docs/Changes-2.0.txt
@@ -499,9 +499,6 @@ Incompatible Changes from GTK+-1.2 to GTK+-2.0:
   g_thread_init() has been called. In order to use the 
   global GDK thread mutex with gdk_threads_enter() and 
   gdk_threads_leave(), you must call gdk_threads_init() explicitely.
-  gdk_threads_init() calls g_thread_init() if it hasn't already
-  been called, so you can typically change your call to g_thread_init()
-  into a call to gdk_threads_init().
 
   If you aren't using GDK and GTK+ functions from multiple threads,
   there is no reason to call gdk_threads_init().

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 22d13bde866aaa5f5cd950468320dee728c687fd..6e7c4682c4c0f21fb6307b4f621dac7d85172ac7 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -516,8 +516,7 @@ gdk_threads_leave ()
  * 
  * Initializes GDK so that it can be used from multiple threads
  * in conjunction with gdk_threads_enter() and gdk_threads_leave().
- * If g_thread_init() has not yet been called, calls
- * g_thread_init(NULL).
+ * g_thread_init() must be called previous to this function.
  *
  * This call must be made before any use of the main loop from
  * GTK+; to be safe, call it before gtk_init().
@@ -526,7 +525,7 @@ void
 gdk_threads_init ()
 {
   if (!g_thread_supported ())
-    g_thread_init (NULL);
+    g_error ("g_thread_init() must be called before gdk_threads_init()");
 
   gdk_threads_mutex = g_mutex_new ();
 }